fix #200, #202

Cenmrev · Jan 17, 2019 · 34a825c · 34a825c
1 parent a2eab8c
commit 34a825c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/V2RayX/AdvancedWindowController.m b/V2RayX/AdvancedWindowController.m
@@ -31,6 +31,12 @@ - (instancetype)initWithWindowNibName:(NSNibName)windowNibName parentController:
     return self;
 }
 
+- (void)removeObservers {
+    [self removeObserver:self forKeyPath:@"selectedOutbound"];
+    [self removeObserver:self forKeyPath:@"selectedRuleSet"];
+    [self removeObserver:self forKeyPath:@"selectedRule"];
+}
+
 - (void)windowDidLoad {
     [super windowDidLoad];
 
@@ -67,7 +73,7 @@ - (void)windowDidLoad {
            forKeyPath:@"selectedRule"
               options:NSKeyValueObservingOptionNew
               context:nil];
-//    [self addObserver:self forKeyPath:@"ruleSetNameField.stringValue" options:NSKeyValueObservingOptionNew context:nil];
+
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(textFieldDidChange:)
                                                  name:NSControlTextDidChangeNotification
@@ -122,11 +128,12 @@ - (IBAction)ok:(id)sender {
     }
     [self textDidEndEditing:
      [[NSNotification alloc] initWithName:NSTextDidEndEditingNotification object:_domainIpTextView userInfo:nil]];
-
+    [self removeObservers];
     [self.window.sheetParent endSheet:self.window returnCode:NSModalResponseOK];
 }
 
 - (IBAction)cancel:(id)sender {
+    [self removeObservers];
     [self.window.sheetParent endSheet:self.window returnCode:NSModalResponseCancel];
 }
 

diff --git a/V2RayX/ConfigWindow.xib b/V2RayX/ConfigWindow.xib
@@ -517,7 +517,7 @@
                             <font key="font" metaFont="system"/>
                         </buttonCell>
                         <connections>
-                            <action selector="showAdvancedWindow:" target="-2" id="15k-Xq-IZU"/>
+                            <action selector="showAdvancedWindow:" target="-2" id="1El-Bd-DKf"/>
                         </connections>
                     </button>
                     <button toolTip="Restart V2Ray and connected to the selected server above" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fnz-Bw-lGu">